remove _gtk_binding_signal_new().
authorMichael Natterer <mitch@imendio.com>
Mon, 21 Jul 2008 09:48:20 +0000 (09:48 +0000)
committerMichael Natterer <mitch@src.gnome.org>
Mon, 21 Jul 2008 09:48:20 +0000 (09:48 +0000)
2008-07-21  Michael Natterer  <mitch@imendio.com>

* gtk/gtkbindings.[ch]: remove _gtk_binding_signal_new().

* gtk/gtkfilechooserdefault.c
* gtk/gtkmenu.c
* gtk/gtkmenushell.c
* gtk/gtkscalebutton.c
* gtk/gtktextview.c
* gtk/gtktoolbar.c
* gtk/gtkwidget.c: use g_signal_new_class_handler() instead. Add
some missing I_() to the signal names.

svn path=/trunk/; revision=20874

ChangeLog
gtk/gtkbindings.c
gtk/gtkbindings.h
gtk/gtkcombobox.c
gtk/gtkfilechooserdefault.c
gtk/gtkmenu.c
gtk/gtkmenushell.c
gtk/gtkscalebutton.c
gtk/gtktextview.c
gtk/gtktoolbar.c
gtk/gtkwidget.c

index 70c46bd9b5d7615ac1c00e561c1d70f92355abc2..159256d31dbd0c9eee331e401bb79e52c5f6fe31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-07-21  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkbindings.[ch]: remove _gtk_binding_signal_new().
+
+       * gtk/gtkfilechooserdefault.c
+       * gtk/gtkmenu.c
+       * gtk/gtkmenushell.c
+       * gtk/gtkscalebutton.c
+       * gtk/gtktextview.c
+       * gtk/gtktoolbar.c
+       * gtk/gtkwidget.c: use g_signal_new_class_handler() instead. Add
+       some missing I_() to the signal names.
+
 2008-07-21  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkspinbutton.c: remove g_return_if_fail() from private
index 8924180a55bc877e822edd6d5ec9a1c2b78e6d27..85734f770e045ff811e1ad97c2b04682365803c9 100644 (file)
@@ -1698,34 +1698,5 @@ _gtk_binding_reset_parsed (void)
     }
 }
 
-guint
-_gtk_binding_signal_new (const gchar       *signal_name,
-                        GType               itype,
-                        GSignalFlags        signal_flags,
-                        GCallback           handler,
-                        GSignalAccumulator  accumulator,
-                        gpointer            accu_data,
-                        GSignalCMarshaller  c_marshaller,
-                        GType               return_type,
-                        guint               n_params,
-                        ...)
-{
-  va_list args;
-  guint signal_id;
-
-  g_return_val_if_fail (signal_name != NULL, 0);
-  
-  va_start (args, n_params);
-
-  signal_id = g_signal_new_valist (signal_name, itype, signal_flags,
-                                   g_cclosure_new (handler, NULL, NULL),
-                                  accumulator, accu_data, c_marshaller,
-                                   return_type, n_params, args);
-
-  va_end (args);
-  return signal_id;
-}
-
 #define __GTK_BINDINGS_C__
 #include "gtkaliasdef.c"
index 8d679cd80f9067991c6a6ed6e4bce8f7c6a51d06..f37a673a3179f363a59929425e17d173a0db56a4 100644 (file)
@@ -154,21 +154,6 @@ void        _gtk_binding_entry_add_signall (GtkBindingSet  *binding_set,
                                         const gchar    *signal_name,
                                         GSList         *binding_args);
 
-/* Creates a signal with a fixed callback instead of a class offset;
- * useful for key binding signals
- */
-guint _gtk_binding_signal_new (const gchar       *signal_name,
-                              GType              itype,
-                              GSignalFlags       signal_flags,
-                              GCallback          handler,
-                              GSignalAccumulator accumulator,
-                              gpointer           accu_data,
-                              GSignalCMarshaller c_marshaller,
-                              GType              return_type,
-                              guint              n_params,
-                              ...);
-
 G_END_DECLS
 
-
 #endif /* __GTK_BINDINGS_H__ */
index cf2ddff020fda7cf38a469b4aad6dde53fe47413..14a6bec9df9a55caaf5885c743ee503aa4f676f8 100644 (file)
@@ -540,14 +540,14 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
    * Since: 2.12
    */
   combo_box_signals[MOVE_ACTIVE] =
-    _gtk_binding_signal_new (I_("move-active"),
-                             G_OBJECT_CLASS_TYPE (klass),
-                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                             G_CALLBACK (gtk_combo_box_real_move_active),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__ENUM,
-                             G_TYPE_NONE, 1,
-                             GTK_TYPE_SCROLL_TYPE);
+    g_signal_new_class_handler (I_("move-active"),
+                                G_OBJECT_CLASS_TYPE (klass),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_combo_box_real_move_active),
+                                NULL, NULL,
+                                g_cclosure_marshal_VOID__ENUM,
+                                G_TYPE_NONE, 1,
+                                GTK_TYPE_SCROLL_TYPE);
 
   /**
    * GtkComboBox::popup:
@@ -562,13 +562,13 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
    * Since: 2.12
    */
   combo_box_signals[POPUP] =
-    _gtk_binding_signal_new (I_("popup"),
-                             G_OBJECT_CLASS_TYPE (klass),
-                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                             G_CALLBACK (gtk_combo_box_real_popup),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID,
-                             G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("popup"),
+                                G_OBJECT_CLASS_TYPE (klass),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_combo_box_real_popup),
+                                NULL, NULL,
+                                g_cclosure_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
   /**
    * GtkComboBox::popdown:
    * @button: the object which received the signal
@@ -582,13 +582,13 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
    * Since: 2.12
    */
   combo_box_signals[POPDOWN] =
-    _gtk_binding_signal_new (I_("popdown"),
-                             G_OBJECT_CLASS_TYPE (klass),
-                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                             G_CALLBACK (gtk_combo_box_real_popdown),
-                             NULL, NULL,
-                             _gtk_marshal_BOOLEAN__VOID,
-                             G_TYPE_BOOLEAN, 0);
+    g_signal_new_class_handler (I_("popdown"),
+                                G_OBJECT_CLASS_TYPE (klass),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_combo_box_real_popdown),
+                                NULL, NULL,
+                                _gtk_marshal_BOOLEAN__VOID,
+                                G_TYPE_BOOLEAN, 0);
 
   /* key bindings */
   binding_set = gtk_binding_set_by_class (widget_class);
index 8a6f0975c5a1c4704cfbb4d4883bce3c62eb66a2..668f61829a4e4a35d964e2d5b7a4d1f72b5c9796 100644 (file)
@@ -570,93 +570,103 @@ _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
   widget_class->size_allocate = gtk_file_chooser_default_size_allocate;
 
   signals[LOCATION_POPUP] =
-    _gtk_binding_signal_new (I_("location-popup"),
-                            G_OBJECT_CLASS_TYPE (class),
-                            G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                            G_CALLBACK (location_popup_handler),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__STRING,
-                            G_TYPE_NONE, 1, G_TYPE_STRING);
+    g_signal_new_class_handler (I_("location-popup"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (location_popup_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__STRING,
+                                G_TYPE_NONE, 1, G_TYPE_STRING);
+
   signals[LOCATION_POPUP_ON_PASTE] =
-    _gtk_binding_signal_new ("location-popup-on-paste",
-                            G_OBJECT_CLASS_TYPE (class),
-                            G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                            G_CALLBACK (location_popup_on_paste_handler),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__VOID,
-                            G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("location-popup-on-paste"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (location_popup_on_paste_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[LOCATION_TOGGLE_POPUP] =
-    _gtk_binding_signal_new (I_("location-toggle-popup"),
-                            G_OBJECT_CLASS_TYPE (class),
-                            G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                            G_CALLBACK (location_toggle_popup_handler),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__VOID,
-                            G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("location-toggle-popup"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (location_toggle_popup_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[UP_FOLDER] =
-    _gtk_binding_signal_new (I_("up-folder"),
-                            G_OBJECT_CLASS_TYPE (class),
-                            G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                            G_CALLBACK (up_folder_handler),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__VOID,
-                            G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("up-folder"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (up_folder_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[DOWN_FOLDER] =
-    _gtk_binding_signal_new (I_("down-folder"),
-                            G_OBJECT_CLASS_TYPE (class),
-                            G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                            G_CALLBACK (down_folder_handler),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__VOID,
-                            G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("down-folder"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (down_folder_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[HOME_FOLDER] =
-    _gtk_binding_signal_new (I_("home-folder"),
-                            G_OBJECT_CLASS_TYPE (class),
-                            G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                            G_CALLBACK (home_folder_handler),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__VOID,
-                            G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("home-folder"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (home_folder_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[DESKTOP_FOLDER] =
-    _gtk_binding_signal_new (I_("desktop-folder"),
-                            G_OBJECT_CLASS_TYPE (class),
-                            G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                            G_CALLBACK (desktop_folder_handler),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__VOID,
-                            G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("desktop-folder"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (desktop_folder_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[QUICK_BOOKMARK] =
-    _gtk_binding_signal_new (I_("quick-bookmark"),
-                            G_OBJECT_CLASS_TYPE (class),
-                            G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                            G_CALLBACK (quick_bookmark_handler),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__INT,
-                            G_TYPE_NONE, 1, G_TYPE_INT);
+    g_signal_new_class_handler (I_("quick-bookmark"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (quick_bookmark_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__INT,
+                                G_TYPE_NONE, 1, G_TYPE_INT);
+
   signals[SHOW_HIDDEN] =
-    _gtk_binding_signal_new ("show-hidden",
-                            G_OBJECT_CLASS_TYPE (class),
-                            G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                            G_CALLBACK (show_hidden_handler),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__VOID,
-                            G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("show-hidden"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (show_hidden_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[SEARCH_SHORTCUT] =
-    _gtk_binding_signal_new ("search-shortcut",
-                             G_OBJECT_CLASS_TYPE (class),
-                             G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                             G_CALLBACK (search_shortcut_handler),
-                             NULL, NULL,
-                             _gtk_marshal_VOID__VOID,
-                             G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("search-shortcut"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (search_shortcut_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[RECENT_SHORTCUT] =
-    _gtk_binding_signal_new ("recent-shortcut",
-                             G_OBJECT_CLASS_TYPE (class),
-                             G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                             G_CALLBACK (recent_shortcut_handler),
-                             NULL, NULL,
-                             _gtk_marshal_VOID__VOID,
-                             G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("recent-shortcut"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (recent_shortcut_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
 
   binding_set = gtk_binding_set_by_class (class);
 
index 2af59de63072c4563b77477101c063a12b2b9173..79caf7e3ec2861b5071748ca5afd632462c76fc5 100644 (file)
@@ -479,14 +479,14 @@ gtk_menu_class_init (GtkMenuClass *class)
   menu_shell_class->move_current = gtk_menu_move_current;
 
   menu_signals[MOVE_SCROLL] =
-    _gtk_binding_signal_new (I_("move_scroll"),
-                            G_OBJECT_CLASS_TYPE (object_class),
-                            G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                            G_CALLBACK (gtk_menu_real_move_scroll),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__ENUM,
-                            G_TYPE_NONE, 1,
-                            GTK_TYPE_SCROLL_TYPE);
+    g_signal_new_class_handler (I_("move_scroll"),
+                                G_OBJECT_CLASS_TYPE (object_class),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_menu_real_move_scroll),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__ENUM,
+                                G_TYPE_NONE, 1,
+                                GTK_TYPE_SCROLL_TYPE);
 
   /**
    * GtkMenu:active:
index 6eac58ab09d602ee814d33daa8bf17240353da9f..f2ca2dcdf0afd4c3ad7947b361c877a6244f1309 100644 (file)
@@ -250,6 +250,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                  NULL, NULL,
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
+
   menu_shell_signals[SELECTION_DONE] =
     g_signal_new (I_("selection-done"),
                  G_OBJECT_CLASS_TYPE (object_class),
@@ -258,6 +259,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                  NULL, NULL,
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
+
   menu_shell_signals[MOVE_CURRENT] =
     g_signal_new (I_("move_current"),
                  G_OBJECT_CLASS_TYPE (object_class),
@@ -265,8 +267,9 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                  G_STRUCT_OFFSET (GtkMenuShellClass, move_current),
                  NULL, NULL,
                  _gtk_marshal_VOID__ENUM,
-                 G_TYPE_NONE, 1, 
+                 G_TYPE_NONE, 1,
                  GTK_TYPE_MENU_DIRECTION_TYPE);
+
   menu_shell_signals[ACTIVATE_CURRENT] =
     g_signal_new (I_("activate_current"),
                  G_OBJECT_CLASS_TYPE (object_class),
@@ -274,8 +277,9 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                  G_STRUCT_OFFSET (GtkMenuShellClass, activate_current),
                  NULL, NULL,
                  _gtk_marshal_VOID__BOOLEAN,
-                 G_TYPE_NONE, 1, 
+                 G_TYPE_NONE, 1,
                  G_TYPE_BOOLEAN);
+
   menu_shell_signals[CANCEL] =
     g_signal_new (I_("cancel"),
                  G_OBJECT_CLASS_TYPE (object_class),
@@ -284,27 +288,29 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                  NULL, NULL,
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
+
   menu_shell_signals[CYCLE_FOCUS] =
-    _gtk_binding_signal_new (I_("cycle_focus"),
-                            G_OBJECT_CLASS_TYPE (object_class),
-                            G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                            G_CALLBACK (gtk_real_menu_shell_cycle_focus),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__ENUM,
-                            G_TYPE_NONE, 1,
-                            GTK_TYPE_DIRECTION_TYPE);
+    g_signal_new_class_handler (I_("cycle_focus"),
+                                G_OBJECT_CLASS_TYPE (object_class),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_real_menu_shell_cycle_focus),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__ENUM,
+                                G_TYPE_NONE, 1,
+                                GTK_TYPE_DIRECTION_TYPE);
+
   /**
    * GtkMenuShell::move-selected:
    * @menu_shell: the object on which the signal is emitted
    * @distance: +1 to move to the next item, -1 to move to the previous
    *
    * The ::move-selected signal is emitted to move the selection to
-   * another item. 
-   * 
+   * another item.
+   *
    * Returns: %TRUE to stop the signal emission, %FALSE to continue
    *
    * Since: 2.12
-   */ 
+   */
   menu_shell_signals[MOVE_SELECTED] =
     g_signal_new (I_("move_selected"),
                  G_OBJECT_CLASS_TYPE (object_class),
index d8adb52e9fede4c18c02206dd5ecb59ae408aec8..27b9be450d6e68e0a6394d41b0e322a2b13f69ab 100644 (file)
@@ -282,13 +282,13 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
    * Since: 2.12
    */
   signals[POPUP] =
-    _gtk_binding_signal_new (I_("popup"),
-                            G_OBJECT_CLASS_TYPE (klass),
-                            G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                            G_CALLBACK (gtk_scale_button_popup),
-                            NULL, NULL,
-                            g_cclosure_marshal_VOID__VOID,
-                            G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("popup"),
+                                G_OBJECT_CLASS_TYPE (klass),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_scale_button_popup),
+                                NULL, NULL,
+                                g_cclosure_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
 
   /**
    * GtkScaleButton::popdown:
@@ -303,13 +303,13 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
    * Since: 2.12
    */
   signals[POPDOWN] =
-    _gtk_binding_signal_new (I_("popdown"),
-                            G_OBJECT_CLASS_TYPE (klass),
-                            G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                            G_CALLBACK (gtk_scale_button_popdown),
-                            NULL, NULL,
-                            g_cclosure_marshal_VOID__VOID,
-                            G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("popdown"),
+                                G_OBJECT_CLASS_TYPE (klass),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_scale_button_popdown),
+                                NULL, NULL,
+                                g_cclosure_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
 
   /* Key bindings */
   binding_set = gtk_binding_set_by_class (widget_class);
index 75b73bdf9e57299d2d29916259408ad910827cea..5a2b68916686a8c8c929f998d6fc0fc680683660 100644 (file)
@@ -756,15 +756,15 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * There are no default bindings for this signal.
    */
   signals[MOVE_VIEWPORT] =
-    _gtk_binding_signal_new (I_("move_viewport"),
-                            G_OBJECT_CLASS_TYPE (gobject_class),
-                            G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                            G_CALLBACK (gtk_text_view_move_viewport),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__ENUM_INT,
-                            G_TYPE_NONE, 2,
-                            GTK_TYPE_SCROLL_STEP,
-                            G_TYPE_INT);
+    g_signal_new_class_handler (I_("move_viewport"),
+                                G_OBJECT_CLASS_TYPE (gobject_class),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_text_view_move_viewport),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__ENUM_INT,
+                                G_TYPE_NONE, 2,
+                                GTK_TYPE_SCROLL_STEP,
+                                G_TYPE_INT);
 
   signals[SET_ANCHOR] =
     g_signal_new (I_("set_anchor"),
@@ -951,13 +951,13 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * for selecting and Shift-Ctrl-a and Ctrl-\ for unselecting.
    */
   signals[SELECT_ALL] =
-    _gtk_binding_signal_new (I_("select_all"),
-                            G_OBJECT_CLASS_TYPE (object_class),
-                            G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                            G_CALLBACK (gtk_text_view_select_all),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__BOOLEAN,
-                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+    g_signal_new_class_handler (I_("select_all"),
+                                G_OBJECT_CLASS_TYPE (object_class),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_text_view_select_all),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__BOOLEAN,
+                                G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
   /**
    * GtkTextView::toggle-cursor-visible:
@@ -970,13 +970,13 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * The default binding for this signal is F7.
    */ 
   signals[TOGGLE_CURSOR_VISIBLE] =
-    _gtk_binding_signal_new (I_("toggle_cursor_visible"),
-                            G_OBJECT_CLASS_TYPE (object_class),
-                            G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                            G_CALLBACK (gtk_text_view_toggle_cursor_visible),
-                            NULL, NULL,
-                            _gtk_marshal_VOID__VOID,
-                            G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("toggle_cursor_visible"),
+                                G_OBJECT_CLASS_TYPE (object_class),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_text_view_toggle_cursor_visible),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
 
   /*
    * Key bindings
index c7b17e4d1fe9f728e857be7614397c44aa282fc2..e2445c04e62c7d67e2615143094761446d614747 100644 (file)
@@ -478,15 +478,15 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
    * Return value: %TRUE if the signal was handled, %FALSE if not
    */
   toolbar_signals[FOCUS_HOME_OR_END] =
-    _gtk_binding_signal_new (I_("focus_home_or_end"),
-                            G_OBJECT_CLASS_TYPE (klass),
-                            G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                            G_CALLBACK (gtk_toolbar_focus_home_or_end),
-                            NULL, NULL,
-                            _gtk_marshal_BOOLEAN__BOOLEAN,
-                            G_TYPE_BOOLEAN, 1,
-                            G_TYPE_BOOLEAN);
-  
+    g_signal_new_class_handler (I_("focus_home_or_end"),
+                                G_OBJECT_CLASS_TYPE (klass),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_toolbar_focus_home_or_end),
+                                NULL, NULL,
+                                _gtk_marshal_BOOLEAN__BOOLEAN,
+                                G_TYPE_BOOLEAN, 1,
+                                G_TYPE_BOOLEAN);
+
   /* properties */
   g_object_class_install_property (gobject_class,
                                   PROP_ORIENTATION,
index 686b0c1266d097696681ab5aa0d953c392239c0e..3d36038565c0bc68ca125af15b24df825b90bbba 100644 (file)
@@ -914,15 +914,15 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GTK_TYPE_DIRECTION_TYPE);
   widget_signals[MOVE_FOCUS] =
-    _gtk_binding_signal_new (I_("move_focus"),
-                             G_TYPE_FROM_CLASS (object_class),
-                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                             G_CALLBACK (gtk_widget_real_move_focus),
-                             NULL, NULL,
-                             _gtk_marshal_VOID__ENUM,
-                             G_TYPE_NONE,
-                             1,
-                             GTK_TYPE_DIRECTION_TYPE);
+    g_signal_new_class_handler (I_("move_focus"),
+                                G_TYPE_FROM_CLASS (object_class),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_widget_real_move_focus),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__ENUM,
+                                G_TYPE_NONE,
+                                1,
+                                GTK_TYPE_DIRECTION_TYPE);
   /**
    * GtkWidget::event:
    * @widget: the object which received the signal.
@@ -1106,14 +1106,14 @@ gtk_widget_class_init (GtkWidgetClass *klass)
    * Since: 2.12
    **/
   widget_signals[KEYNAV_FAILED] =
-    _gtk_binding_signal_new (I_("keynav-failed"),
-                             G_TYPE_FROM_CLASS (gobject_class),
-                             G_SIGNAL_RUN_LAST,
-                             G_CALLBACK (gtk_widget_real_keynav_failed),
-                             _gtk_boolean_handled_accumulator, NULL,
-                             _gtk_marshal_BOOLEAN__ENUM,
-                             G_TYPE_BOOLEAN, 1,
-                             GTK_TYPE_DIRECTION_TYPE);
+    g_signal_new_class_handler (I_("keynav-failed"),
+                                G_TYPE_FROM_CLASS (gobject_class),
+                                G_SIGNAL_RUN_LAST,
+                                G_CALLBACK (gtk_widget_real_keynav_failed),
+                                _gtk_boolean_handled_accumulator, NULL,
+                                _gtk_marshal_BOOLEAN__ENUM,
+                                G_TYPE_BOOLEAN, 1,
+                                GTK_TYPE_DIRECTION_TYPE);
 
   /**
    * GtkWidget::delete-event: